Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[7.17](backport #40238) Go-based changeset definition for MODULE #40945

Merged
merged 26 commits into from
Oct 14, 2024
Merged

[7.17](backport #40238) Go-based changeset definition for MODULE #40945

merged 26 commits into from
Oct 14, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 23, 2024

Proposed commit message

Added MODULE env var definition within mage.
MODULE is set within invoking mage target, if there are changes brought by the PR, instead of calling separate bash-script to evaluate changes and define variable.

Checklist

  • My code follows the style guidelines of this project
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • I have made corresponding change to the default configuration files
  • I have added tests that prove my fix is effective or that my feature works
  • I have added an entry in CHANGELOG.next.asciidoc or CHANGELOG-developer.next.asciidoc.

Related issues

Logs

BK builds:

This is an automatic backport of pull request #40238 done by [Mergify](https://mergify.com).

@oakrizan @mergify
Go-based changeset definition for MODULE (#40238)
54f3296 
Added MODULE env var definition within mage

(cherry picked from commit cc0bda7)

# Conflicts:
#	.buildkite/heartbeat/heartbeat-pipeline.yml
#	.buildkite/x-pack/pipeline.xpack.auditbeat.yml
#	.buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
#	.buildkite/x-pack/pipeline.xpack.metricbeat.yml
#	.buildkite/x-pack/pipeline.xpack.winlogbeat.yml
#	x-pack/auditbeat/magefile.go
@mergify mergify bot requested a review from a team as a code owner September 23, 2024 09:43
@mergify mergify bot added the backport label Sep 23, 2024
@mergify mergify bot requested a review from a team as a code owner September 23, 2024 09:43
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Sep 23, 2024
@mergify mergify bot requested a review from a team as a code owner September 23, 2024 09:43
@mergify mergify bot removed the request for review from a team September 23, 2024 09:43
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 23, 2024

Cherry-pick of cc0bda7 has failed:

On branch mergify/bp/7.17/pr-40238
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit cc0bda7688.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .buildkite/metricbeat/pipeline.yml
	deleted:    .buildkite/scripts/changesets.psm1
	new file:   dev-tools/mage/module_changeset.go
	modified:   metricbeat/magefile.go
	modified:   x-pack/metricbeat/magefile.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .buildkite/heartbeat/heartbeat-pipeline.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.auditbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.dockerlogbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.metricbeat.yml
	both modified:   .buildkite/x-pack/pipeline.xpack.winlogbeat.yml
	both modified:   x-pack/auditbeat/magefile.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot requested review from mauri870 and khushijain21 September 23, 2024 09:43
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Sep 23, 2024
@oakrizan oakrizan added ci Team:Ingest-EngProd and removed conflicts There is a conflict in the backported pull request labels Sep 24, 2024
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Sep 24, 2024
@mergify Mergify
Copy link
Contributor Author

mergify bot commented Sep 30, 2024

This pull request has not been merged yet. Could you please review and merge it @oakrizan? 🙏

@oakrizan
Copy link
Contributor

oakrizan commented Oct 2, 2024

PTAL @alexsapran @belimawr @nfritts

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 7, 2024

This pull request has not been merged yet. Could you please review and merge it @oakrizan? 🙏

rowlandgeoff
rowlandgeoff reviewed Oct 7, 2024
View reviewed changes
.buildkite/x-pack/pipeline.xpack.winlogbeat.yml Outdated
@@ -18,6 +18,8 @@ env:
RACE_DETECTOR: "true"
TEST_COVERAGE: "true"

BEAT_PATH: "x-pack/winlogbeat"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

x-pack.winlogbeat didn't need the BEAT_PATH in the main branch? https://github.com/elastic/beats/blob/main/.buildkite/x-pack/pipeline.xpack.winlogbeat.yml

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right, it shouldn't be there. For x-pack/winlogbeat in Jenkinsfile within 7 steps running mage build unitTest, only 1 has withModule in both main and 7.17 - which seems to be an inconsistency. I have mentioned it here.
Will remove it.

@mergify Mergify
Copy link
Contributor Author

mergify bot commented Oct 14, 2024

This pull request has not been merged yet. Could you please review and merge it @oakrizan? 🙏

@oakrizan oakrizan merged commit 4fe1fdc into 7.17 Oct 14, 2024
135 checks passed
@oakrizan oakrizan deleted the mergify/bp/7.17/pr-40238 branch October 14, 2024 09:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@oakrizan oakrizan oakrizan left review comments

@rowlandgeoff rowlandgeoff rowlandgeoff approved these changes

@mauri870 mauri870 Awaiting requested review from mauri870 mauri870 is a code owner automatically assigned from elastic/elastic-agent-data-plane

@khushijain21 khushijain21 Awaiting requested review from khushijain21 khushijain21 is a code owner automatically assigned from elastic/elastic-agent-data-plane

@belimawr belimawr Awaiting requested review from belimawr

@alexsapran alexsapran Awaiting requested review from alexsapran

@pazone pazone Awaiting requested review from pazone

@nfritts nfritts Awaiting requested review from nfritts

Assignees

@oakrizan oakrizan

Labels
backport ci Team:Ingest-EngProd
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@oakrizan @rowlandgeoff